Updated to rust nightly 2015-03-04

diff --git a/Cargo.lock b/Cargo.lock
index 6e572b3061743228954a804d66118474062f6c47..0c0568c7ef185ba99b24c5bad4f63af4f30ab1b1 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3,26 +3,26 @@ name = "cargo"
 version = "0.1.0"
 dependencies = [
  "advapi32-sys 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "curl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "docopt 0.6.39 (registry+https://github.com/rust-lang/crates.io-index)",
+ "curl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "docopt 0.6.44 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "flate2 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "git2 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "git2-curl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glob 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glob 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "hamcrest 0.1.0 (git+https://github.com/carllerche/hamcrest-rust.git)",
  "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "registry 0.1.0",
- "rustc-serialize 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "semver 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "semver 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "tar 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "term 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "threadpool 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "threadpool 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "toml 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -41,33 +41,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "curl"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "curl-sys 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "curl-sys 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "curl-sys"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libz-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "pkg-config 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "docopt"
-version = "0.6.39"
+version = "0.6.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "regex 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -76,7 +77,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "log 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -88,11 +89,6 @@ dependencies = [
  "miniz-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "gcc"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "gcc"
 version = "0.3.1"
@@ -105,8 +101,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libgit2-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libgit2-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -114,15 +110,15 @@ name = "git2-curl"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "curl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "curl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "git2 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "glob"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -145,13 +141,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "libgit2-sys"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libssh2-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libssh2-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "libz-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "pkg-config 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -165,12 +161,12 @@ dependencies = [
 
 [[package]]
 name = "libssh2-sys"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libz-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "pkg-config 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -203,19 +199,15 @@ dependencies = [
 
 [[package]]
 name = "openssl-sys"
-version = "0.4.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "gcc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libressl-pnacl-sys 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "pkg-config"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "pkg-config"
 version = "0.3.0"
@@ -228,25 +220,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "regex"
-version = "0.1.15"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "registry"
 version = "0.1.0"
 dependencies = [
- "curl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "curl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "rustc-serialize"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "semver"
-version = "0.1.15"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -266,7 +258,7 @@ dependencies = [
 
 [[package]]
 name = "threadpool"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -283,16 +275,16 @@ name = "toml"
 version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rustc-serialize 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "url"
-version = "0.2.22"
+version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]

diff --git a/Cargo.toml b/Cargo.toml
index 7117fc94890ba4e9673cf6462e322d1d0c775438..927a0a5388f81a4ec85e1098ffecb86248d7528f 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,24 +10,24 @@ name = "cargo"
 path = "src/cargo/lib.rs"
 
 [dependencies]
-toml = "0.1"
-semver = "0.1"
-curl = "0.2"
-tar = "0.2"
-flate2 = "0.2"
-git2 = "0.2"
-git2-curl = "0.2"
-glob = "0.2"
-time = "0.1"
-log = "0.2"
-env_logger = "0.2"
-docopt = "0.6"
-url = "0.2"
-rustc-serialize = "0.3"
-term = "0.1"
-regex = "0.1"
-threadpool = "0.1"
-libc = "0.1"
+toml = "0.1.18"
+semver = "0.1.16"
+curl = "0.2.1"
+tar = "0.2.3"
+flate2 = "0.2.0"
+git2 = "0.2.1"
+git2-curl = "0.2.1"
+glob = "0.2.2"
+time = "0.1.19"
+log = "0.2.5"
+env_logger = "0.2.2"
+docopt = "0.6.44"
+url = "0.2.23"
+rustc-serialize = "0.3.1"
+term = "0.1.13"
+regex = "0.1.17"
+threadpool = "0.1.1"
+libc = "0.1.2"
 
 [target.i686-pc-windows-gnu.dependencies]
 winapi = "0.1"

diff --git a/src/bin/cargo.rs b/src/bin/cargo.rs
index d966d003442b0c9fa424ee2646393b18477534de..c381d728a136a1a1dcb32f14442c87035cbef793 100644 (file)
--- a/src/bin/cargo.rs
+++ b/src/bin/cargo.rs
@@ -1,4 +1,4 @@
-#![feature(collections, core, io, path, process, fs, env, std_misc, os, old_io)]
+#![feature(collections, core, io, path, fs, std_misc, os, old_io, exit_status)]
 
 extern crate "git2-curl" as git2_curl;
 extern crate "rustc-serialize" as rustc_serialize;

diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs
index 7defa760c6f78a1ef7613c45f6b5610d99c5523a..e90594d9e4a8280acb5ec67357e9a03561f82357 100644 (file)
--- a/src/cargo/lib.rs
+++ b/src/cargo/lib.rs
@@ -1,6 +1,6 @@
 #![deny(unused)]
-#![feature(collections, hash, os, std_misc, unicode, env, core)]
-#![feature(io, path, str_words, process, fs, old_io)]
+#![feature(collections, hash, os, std_misc, unicode, core)]
+#![feature(io, path, str_words, fs, old_io, exit_status)]
 #![cfg_attr(test, deny(warnings))]
 
 #[cfg(test)] extern crate hamcrest;

diff --git a/src/cargo/ops/cargo_rustc/custom_build.rs b/src/cargo/ops/cargo_rustc/custom_build.rs
index 60f936b16df523cdef92cdd1c19ae5d1bf33d239..628fc7b545d01de5d5ea13abdbcfb14deaa34ee7 100644 (file)
--- a/src/cargo/ops/cargo_rustc/custom_build.rs
+++ b/src/cargo/ops/cargo_rustc/custom_build.rs
@@ -260,7 +260,7 @@ impl BuildOutput {
         let whence = format!("build script of `{}`", pkg_name);
 
         for line in input.lines() {
-            let mut iter = line.splitn(1, |&: c: char| c == ':');
+            let mut iter = line.splitn(1, |c| c == ':');
             if iter.next() != Some("cargo") {
                 // skip this line since it doesn't start with "cargo:"
                 continue;
@@ -271,7 +271,7 @@ impl BuildOutput {
             };
 
             // getting the `key=value` part of the line
-            let mut iter = data.splitn(1, |&: c: char| c == '=');
+            let mut iter = data.splitn(1, |c| c == '=');
             let key = iter.next();
             let value = iter.next();
             let (key, value) = match (key, value) {

diff --git a/src/cargo/sources/path.rs b/src/cargo/sources/path.rs
index 11352770e541f6dffe920cfedeb452040e0b6d79..c94b91dd75c0139c3f04f894a05a42ed14383e65 100644 (file)
--- a/src/cargo/sources/path.rs
+++ b/src/cargo/sources/path.rs
@@ -77,7 +77,7 @@ impl<'a, 'b> PathSource<'a, 'b> {
     pub fn list_files(&self, pkg: &Package) -> CargoResult<Vec<PathBuf>> {
         let root = pkg.root();
 
-        let parse = |&: p: &String| {
+        let parse = |p: &String| {
             Pattern::new(p).map_err(|e| {
                 human(format!("could not parse pattern `{}`: {}", p, e))
             })

diff --git a/src/rustversion.txt b/src/rustversion.txt
index 86e833e0e4c51ddc4d5171daefbc4697499d0273..ac5240e643fae49f7bea9dc31a200fca1b0341bd 100644 (file)
--- a/src/rustversion.txt
+++ b/src/rustversion.txt
@@ -1 +1 @@
-2015-02-27
+2015-03-04